* net/tramp.el (top): Don't fail if there is no current message.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e26cdc62dd29b7736453e9b71effc9e4a89fe7fa..284745de5b9fa010a59d694b197e831a822890b3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+       * net/tramp.el (top): Don't fail if there is no current message.
+
 2008-12-10  Kenichi Handa  <handa@m17n.org>
 
        * international/fontset.el (setup-default-fontset): Add an entry

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 83f87472dfd432ad709bcdafdf5275093fb72a5f..031d2fecc3285eb4c241b9b39de98efb4d80256d 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -7470,7 +7470,8 @@ Only works for Bourne-like shells."
       (unload-feature 'tramp 'force)
     (error nil)))
 
-(when (and load-in-progress (string-match "Loading tramp..." (current-message)))
+(when (and load-in-progress (string-match "Loading tramp..."
+                                         (or (current-message) "")))
   (message "Loading tramp...done"))
 
 (provide 'tramp)